config-related cleanup