remove hard coded names