Realized we can clear in commit automatically. Much nicer for tests,
could clear away all the manua clearing.