[ViX-HD & Magic-HD] Some code cleanup