Removed a TODO which now has an issue