[remove extra code and some validation changes]