Remove redundant implementations
Remove redundant local function
Replace old predicate bindings