Simplify definition of Products
Remove commented code from products.go