Removed unused logging handler
Bug fixes