(#84) - Remove duplicate functionality