Remove require, add Uglify and more cleanup