Rename target and remove unneeded arrays.