Remove unused 'that=this'