Cleanup some more.