Handler-related cleanup