Add code to clean up