remove unnecessary junk, add queue