Continuing to clean up and document