Eliminate unnecessary code

Changes for flattening eliminated the calls to these routines.