version bump
improved cleanup at disable