Removing code that create's strange routing behavior