master- remove unncessary classes and properties