Add support for Cap 3.

Remove extraneous code related to previous versions.