WIP Clean up log messages