- Cosmetics
- Drop unneeded headers