Cleanup, but keeping debouncer for a bit