Remove scripts.js and merge with master.js