cleaned up router spaces