Remove Expanded and Clean Up

Move Expanded to Orca Settings and Clean Up Orca Tools