added keyfile
remove keyfile stuff