Removing unused code from shaft.