Remove useless include.
Various cleanups.