fix the clean method cleaning keys way too soon.