Remove setting variables from functions that are short