Revert "Revert "slightly trim""

This reverts commit 360f8ca78703e1f54ca33b1f41977fa2d766b103.
We really need some space. Build fails