More code-style removal.