Updated configs
Cleanup