Aaaand more clean up
Settings page
Config update
Fixing
Time to get rid of that code xD