Cleanup and skip failing doctest