Remove more harded coded values