Clean up various things like logging statements and stray TODOs.