Various cleanup. Setting not to use PCA as default