Cleanup for debounce config
Minor tweaks