massive update and cleaning