dotCMS/dotCMS#5069 More clean up