removed some mapping