smaller cleanups, use normal queue on stampede for tests