Removed unnecessary variable assignments