removed unnecessary assignments