model cleanup
mass import developement