classes we do not need anymore
Revert "All set besides the Switch"

This reverts commit e5a61d1033361266ca99a7df91f59c3f86eb5577.