Clean up code

Resolve coredump of the linker when linking arcv1 and arcv2 objects together.