Rc1/test cleanup