- renamed method and fixed remove target bug