Why are these commented out? If they are not needed we should just remove them.