Removing extra echo statement