Renames and remove target Stuff

Renames and remove target Stuff