WIP remove verbose logging