Finish up settings management

.... Introduce functionality by removing code. Love it :)