Settings revamped
Remove debug code from settings