Some more cleanup.