REMOVE: Entity context menu
untabified some files