Remove unnecessary free-variables from renamer