Cleanup here and there.