fix clean functions