require.js refactor
Cleanup