Changes to remove queue