Removed unused code
Removed unused method
Small menu bug fix