Merge "Remove obsolete functionality" into rvc-dev