Removal of unused code.