Remove some more bloat
- at least till we build for Boost