cleaned from requirejs and some other changes