code cleanup

remove deprecated code
more cleanup
Merge branch 'master' into remove-backwards-compatibility
Merge pull request #22 from druid-io/remove-backwards-compatibility

remove code for backwards compatibility