removed unused variable: that