Clean up some of the models