Cleanup. see Issue #31 and commit 8d6d2c7b1c1d18a0a8d1ab57b9200e8b495453c3