Removed unused code. re #5403