those commented out lines should be removed