Cleanup of DrillModeController and DrillContentManager, with injection