jpetersen Remove dead code