Removing ancient TODO