Cleanup of some remaining Logger stuff
Merge pull request #24 from flikka/cleanup-logger

Cleanup of some remaining Logger stuff