cleaning up all classes, removing testing methods and properties