remove unused variables

This change will be reverted