Clean up function calls to unit methods in ov-core.lua