Clean up DELEGATED_METHODS