Coding style cleanup and stray file removal.