Cleaning, Fixed config options