remove duplicated functionality