Don't do multi-line ternary
Remove currently unused predicate definitions