adding make rebuild and cleaning up models