More cleanup
Clean up extra logging