Further cleanup - version bumped to v0.8.5