Remove more no longer required/used features.
The plan on all this cleaning is to allow us to make changes and find problems an awful lot easier