Issue #108: Do some cleanups