8.23, clean up