Updated bindings again, fixed defunct code