Remove impl and testing