misc: unnecessary imports were removed
misc: unnecessary keyword parameter passing was removed