Doing some more cleanup.