Close #9 - Remove obsolete keepOriginal options