Remove the double mapping