get rid of Extended mapper