Some small cleanups.

TODO: remove old todos that have been done.