Cleanup: Removed unused predicates and unnecessary overloads.