A lot of deletes to start work on raft

All tests failing