remove unit type/value in favor of unit tuples