Removed unnecessary menu checks
Removed unnecessary menu checks