start of cleanup
updatses