cleanup & removed unused menu items
changed to debug mode