Issue 12: Removing necessary menu items

(code_refactoring)