Fixed menu (lp: #1171433)
Removed unused imports