These lines are commented out. Should they be removed?