Add in jcommander options, remove custom principals from my env