delete unused modules, new data.js and using q for chaining