cleanup the model.py