Cleanup, kinda started a big mess by moving a bunch of settings to JSON. Nothing works right now.