Removing more tactic compatibility layer.