More cleanup of old record stuff