cleaning up model