More cleanup of credits