Removal of some hard coding