remove duplicate functionality