Remove unused function, rename variable.