Remove state bloat