previous implementation of cipher token removed & refactored one added as default
performance test removed as they weren't used