Cleanup of symmetric crypto functions and definitions. Broke a few tests.