Remove commented out code
Remove the isPresentingCalloutForAnnotation: method and, in its place, add the isPresentingCallout property and make the calloutAnnotation property publicly readonly