Remove obsolete log types

Also added back in some logging points that had been lost.