The P2 World wouldn't clear down fully on a State change, now properly clears out contacts, resets the bitmask, etc.