Cleanup of predicates