removed queue, rely only on prioritized list
clean up