Add a clean up method