Removing tactic compatibility layer from Inv.