[!!!][TASK] Cleanup ContextMenu classes