[#861353] Clean up.