cleaned up countermeasures