removed vir helper and autocommit