Cleanup in variables.js