Remove unused file
Refactor config a bit