removed puppet core options (not tested!!!)