Removes require.js dependency
Misc changes