Removed more Slave config and routing