VE-742 Some cleanup