Remove unnessesary echo's