Cleanup old model classes, modify CMakeLists

Authored by rahulch on Mar 9 2015, 7:34 PM.