add DrCr enum and remove unused functions