class cleanup, and removing unused files.