Beginnings of cleanup of Queue classes