Removed unused tools. Added mode switchers.