Remove broken url handling

This patch removes the broken URL handling as discussed in #44