Cleaned settings more