removed unnecessary parameter from functions