fixing consintency in configurations to always use 'ON', instead of using 'YES' in a few configs, but making it retro-compatible with older configurations
removing unused configuration