Cleanup - remove unused variables
Cleanup - remove unused variables