remove hard coded values