Encryption cleanup, removed redundant encryption functions