removed lots of bloat