Started doing a bit of cleanup in the models.