bug squashing, removing unused classes