Shield tracking cleanups.