Remove not longer needed code.
Remove not longer needed code.