removing duplicate mapping declarations in xml, moving it to code instead. I suspect there is a better way, but for now this is slightly better.