VBT-307: Unsuppressed records, cleaned up