Cleanup of stupid echo statement left