More clean up. Deleted many useless methods and classes. Still needs removing of ShepherdsTale specific code, and migration to simpler model system, with static methods on PODs