Cleanup - remove unused variables
Cleanup - javascript
Cleanup - javascript