Revert "remove unused variables"

This reverts commit 351bd57e5cea0e41e468ea504e6590cc1b9d7d51.
remove unused variables