got rid of unused classes. cleaning up