Removed redundant code in Mapper impl.