team model clean up