mass cleanup and update