Cleaned up some debug logging