cleanup to remove hardcoded literals in crypto