Fix clean up