pulling old delegate lines (should clean up the manual solution in initializers, too)