Fix to remove pages from different context