Did some housekeeping and got rid of unused classes and old files