Tidy up while testing on running system.