Limestone feature cleanup pass. Config added.