cleanup up classes and deleted commented out code