Removal of more unaccessed code.