Remove salt and no longer used encrypt methods