Keys and config file cleanup