Minor: Removing instances of VariableRenaming wherever not required.