Cleanup includes
Prepare bias_mode support
Cleanup the configuration system
Continue support of bias mode
Implement bias mode
Tests for bias_modes