Remove circular dependencies in natural key setup.