Cleanup

Removed unused variables