+1 on a cleanup