CDB-3913 code cleaning
Merge branch 'CDB-3913' of https://github.com/CartoDB/cartodb into CDB-3913
Merge branch 'CDB-3913' of https://github.com/CartoDB/cartodb into CDB-3913