Cleaned up

Cleanup of debugging echos