cleanup & fix product containers