Cleanup after #59