Should this be removed or marked with a TODO?