model clean up