#515 removes one time variables
#515 removed another one time variable