Backward compatibility for 'cleanup' option