remove more tombstone comments