Remove dead code imported from ripple