rm'd echo statements