Removed some test-hardwiring.