Just some more cleanup.