cleaned up spystate some more