Remove dependecy to router