Merge "Fix removeTarget to remove by ID instead of index." into mnc-dev