cleaning up in Models