queue cleanup
queue model test clean up