Removed legacy code from cipher