cleanup and get rid of spurious errors