Removing the NOCRYPT/UNCRYPT defines