Remove duplicates in public api