VE-1521 Clean up unused code