Should this be removed or commented with a TODO?