Removed some debug messages and spurious echos