Clean up record handling