Fix some warnings
Remove unneeded class
Externalize config