Removed unused code from previous merges.