Remove PersistentAppState as it is no longer required. Remove AppWindow. Pair: Tim