(Menu entries) Cleanups