Deleting classes and a couple of bug fixes.