Removing some useless hardcode