[Issue #105] post-merge cleanups