Clean up bindings
Merge