better cinder cleanup