Merge "Removing redundant code and function arguments."