Add support for Cap 3.

Remove any extraneous code.