remove some validation & unnessecary variables