Remove work around for MySQL and log more cleanly
Fixes #21