Clean-up and model change