Improved logging
Disabled some logging