Disabled custom settings, will move to dev branch