Remove accidentally committed code.
Add protection against normal content.

Not sure on this one, but it may shut up the tests for
the moment anyway.