Oops another cleanup