Removing the old InstanceTypes class
Removing the old OnDemandPricing class
Removed more cruddy code