Cleaning up the model