Fix compilation, remove dead code

Authored by mwolff on Jan 10 2018, 2:31 PM.