Removed old model.
Cleaning up.
More cleanup.