remove server argument from router functions