Issue #4: removing unnecessary parameters