Deleted some classes to recduce clutter. Finished Cleanup of models.