Removed some redundant code from decrypt