is this all still needed with the tombstone2 stuff out?