Cleanup and config rename
Cleanup