remove misleading log & move verify on cleanup within cleanup block