octacraft: cleanups