CDB-3057 Removed dead and unneeded code
Merge branch 'master' into CDB-3057
Merge pull request #496 from CartoDB/CDB-3057

CDB-3057