RemoveWAT 2.0