simplify settings
cleanup