working on cleaning up queue package