Clean-up for "Changed point selection from delegate pattern to block callbacks"