remove unused parameter
extract common configuration definitions

to a separate module, to avoid dependency cycles.