Remove map conversion code