unnecessary instances of router removed