redid enqueue functions
clean up