Config cleaned up, no more conflicts with dm2e-ws