CHANGED:  starting cleanup