Unused code removal
Corrected extender_url_handler behavior
HHVM compatibility