Osx pkeyauth merge - clean up