SDPIII-19 cleanup over Commit: 3c98db80701235461c5a19af92e4e3ee39cea122