Temporary removal of targetList references