Removed AppContext usage