Model clean up in preparation for milestone 7