Remove CloningDirector and associated code