Revert "Merge pull request #136 from Js41637/advsettings"

This reverts commit ca5cafe7d3e2228e99fc9267b0756d50a521b672, reversing
changes made to 86d976b9c9245fdba50276fa0d57fe99ca4f957c.