SLDContent code cleanup