Removing the context menu - too many bugs