eliminates some old hard-coded assignments