Remove dead code. These abstractions are no longer relevant