Context menu updates

Removing redundant code