And another cleanup run...