cleanup and getting started with models