Remove dead code
Merge remote-tracking branch 'jckarter/master'