Started cleaning up by deleting classes that are no longer used.