Further rename config files to ignore from selftest
Remove unnecessary requies
Code cleanup: code style