Removed some more test-hardwiring.