Moving the last bits of logging over to NLog
Cleaning up logging