No point in making necessary parameters optional.
Removed unused and duplicate function.
Don't make necessary parameters optional.