Remove clean race condition, add more clean tasks