Clean up the rest of the spies