Get rid of unused Queue data type