[TO BE REBASED] Removed unnecessary 'CONFIG_TRUE' checks