further route rework/simplificaiton, lots of trimming