Removed more echo. lines.