cleanup - removed some unnecessary classes and files.