Use the standard s3 wagon.

- Deleted code is debugged code.