In order to let the docs comply with what we have in the code, we have to adjust some of docs definitions and also remove partially. Change-Id: Ied5791d196267abfc1e1717d23751b1acf8e9dc1