Peter's commit: recording utility cleanup