More cleanup.
Merge branch 'master' into titan_testing