A few tidying issues (surplus parameters in functions, error messages, etc)
A few tidying issues (surplus parameters in functions, error messages, etc)

EOL/eol_php_code,EOL/eol_php_code,EOL/eol_php_code,EOL/eol_php_code,EOL/eol_php_code