Commented unnecessary echo statements