Update config
Remove warning and clean up