Merging the first round of cleanup into dev.

[tfjmp]

First round of cleanup done. There is more to do, but we need to do other things too.