Removed extra echo statements