* Remove manual configuration and legacy config file import * Remove unused imports in tests after rebase