remove target
update for mapping