Cutting down on bloat, in preparation for a script overhaul