[MAT-180] Cleanup bindings types