products.yaml updates and cleanup