remove :TODO: that's already been done