Fixed: Removed excess code.
New bug found: Changing the settings has no effect.