Remove echo code