Cleanup.

Remove commented code that we don't need.

Add test case for a non-whitelisted predicate.