Remove test
Remove auto-config handling