Remove duplicate functionality