Remove TODO we track this in issues