rewritten clean new routes - fix #29