Post verification tidy up