cleaning up some model pieces