Cleaning up codebase, remove redundant classes