updated bindings (cleanup)