Remove unnecessary changes
Fix unused variable warning