Handler-related cleanup

what's the point of this?