Merge "libpdx: Remove redundant code"