Minor refactor about load/remove queue