JBIDE-13773 Clean-Up New Context Menu