Removed logging
Static analysis fixes