reduce bloat and fix responsiveness