e9bc8cfe9d
Clears out the last spot where we were only using Clipper1 (how'd I miss that?) and remove all calls to the Clipper1 structures