Removed unused code.
Coments to echo.