Make sure to set the new echo sample buffer and remove an unused macro