cleanup + failed attempt to make one model for all systems.