Quiet routes map extend and routes remove by pattern

Subject plus some refactoring. Tests added, tests had been running.