Remove some bloat