Removing some echo statements