Cleanup of unused dispose(), see #60