- Removing dead code and style changes