remove white hard coding