Save context & remove pp dep