Simplify settings, remove TODOs