Removed unused old code that now have been mostly replaced
Removed also old ContextMenu