Removing hook_menu_alter for now and addressing feedback from code review