Config cleanup