Cleaned up cryptsuite