Clean up Products and Solutions some more