libcommon|Menu: Cleanup