Remove unused PCA_KEEP_ARGS

Simplifies the code, and removes one path to be tested.

Change-Id: Ie0fe8329a0a9130def5e03438a029ae88b6b1431