fix clean up