Controller Settings cleanup