replace some leftover hard coded values