Merge "Remove stub since proper delegate is implemented"