Removing some duplicated variables that were introduced in merge