Remove duplicated implementation