Remove DSS handler for DSS, revert IVA changes