Remove unwanted pathfinder and fixed context.