A handful of model classes
Removing some unused boilerplate classes