remove hard coding