Remove unused condition
Fix binding provider support