Add some debug messages, remove others #1138211