Merge "Remove debug code before beta release." into rvc-dev