code cleanup, reverted menu paths