Removed code bloat