Moved 'clean up' option to 'extended' section