Finished cleaning up the subsystem model, pass model check