[S390] cleanup psw related bits and pieces