Fixed null subsystem on deploy, removed some things for testing