Product tags stuff and cleanup