Remove unused functions
Remove unused vars
Merge branch 'master' of github.com:walmartlabs/thorax