CLEANUP_OPTIONS: Revise options by applying Grigore's comments
Merge branch 'work'