Clean up the model