Should the commented out lines be removed or marked as "TODO"?