Clear them out on smarter logic

It more things than I knew of went through that order update

Change-Id: If5536c51ac07f281846895ff16821a4715375f9d