SAMZA-296: Configuration cleanup