Removed unused code
improved URL enforcement
Merge remote-tracking branch 'origin/master'