Merge "remove unused variable warning"