removed constants rendered unnecessary by the new numbering scheme, and did other miscellaneous code cleanup