Cleaning up models a bit.