Trim
Settings cleanup