#1028 Remove old code, add new to Settings