[CLEANUP] Additional Changes from the OEM Documentation Rest endpoint epic.