remove unused variable
merge with master