Refactor: Clean up comments

Remove a few logging statements and other
minor housekeeping things.