Removed redundent variable assignments