Removed unsed code, Added product group