remove TODO relating to #795