Removed unused imports, menu, layout elements