removed unnused code
remove code no longer needed
updated cdb.js
Merge branch 'CDB-3913' of github.com:CartoDB/cartodb into CDB-3913