Cleaned up models after I realized I half-assed it while porting to the "simple" app