Remove merge conflict left-over from clef.cpp

It turned out it was simply a matter of removing the code 'commented out' with `#if 0` -- `#else`. No actual change to executed code.