Removing echo testing code