Remove remaining PLPA stuf