remove router wrapper class in order to decrease complexity