Merge "Remove unnecessary code and masking" into rvc-dev