Cleaned up echos