Removing a few more of the custom logging things