Lots of clearing up for the ModelController