removed unnecessary/duplicated functionality