Merge: FFI clean up