Cutting down excess code