Clean up enable/disable state