Remove these commented out lines and we can merge it.