Add pedantic touching state cleaning