[MAT-180] Attempt to cleanup bindings types