Remove some unnecessary echoes