Clean up products and versions list
Remove unused functions