PCA cleanup

see commit log.