remove hard code and commented  value