remove hard coded stuff