[Spitbol] Cleanup