Cleanup and config changes