Cleanup of CallCallBack.yp (done by Frank).