Implementation of issue #17
Removed last trace of old url compatibility code