Removed AppState work - not needed for now