Remove some echo's