Yet another cleanup