Few more tweaks

Removed a couple echos that aren't needed.