Add cleanup and process for 0002