remove some echo and print statements