Remove our and their from makeconversion