3.8.6, clean up