yet more cleaning