Fix clean up.