Cleaned Menus, TODOS