Code

Updated goto, skip entries which are on the remove queue