Fix pbr cleanup