upgrade to 7.31
clean up