Cleanup record convert functions