Removed logging mostly