random safe cleanup suggested by IDEA
Merge branch 'ask-random-cleanup'