Changed removal of context menu items to remove items without static
attribute rather than having dynamic attribute.