Adding back in a clean up step