Added option cleaner utility class