Cleanup and initial S3 tool.