pioneers: cleanups