models clean up