remove hard coded part