Some minor changes.

No big changes. Deletions of blank lines, unused usings and obsolete
methods.