survivor cleanup 2

Change-Id: If3c77efb9ccbfed6ed7e1bdf7c9f505e760adcb3