Removal of some unused code.