Remove SVA code