Issue #49: removed unnecessary arguments from drivers