Removed Echo comments