Remove unused parameters and fix blank line within conditional
Remove unused parameters