Removed unnecessary assignments