Fix clean up task