Clean up and dont decrease logging info