remove hard code