Cleanup; raw bytes with optional decoder