Updated userprefs and commented out whitelist