Minor cleanup and eliminate a bad copy