Remove unnecessary constant and default argument