Remove some duplicated variables