[CLEANUP] Use proper Clickmenu API