Is this a TODO? Or need to be removed?