remove duplicate methods and tests