sosiouxme Remove obsolete workarounds, strengthen route section

Latest commit bc3073d

Aug 6, 2015