Adding debug logging to see what kind of callback is sent to the handler
Remvoing properties that don't appear to be used