cleanup and bump to 7.42