[TASK] General code cleanup in ext:sv