Remove extra file that made its way into r29490.

cmr=v1.7.4:ticket=3862
fix compile error introduced by r29488

Apologies for the breakage, I did my test build in the wrong window...

No reviewer.

cmr=v1.7.4:ticket=3865
Fix scif configury.

cmr=v1.7.4:ticket=3862