config fix and clean