Close. Neither case is fully correct

Communisn is the doctrine of the conditions of the abolition of the Proletariat

-Engels, The Principles of Communism

The bourgeoisie doesn’t create value, the proletariat does, correct, but dogmatic class warfare is anti-Marxist. Class warfare must service the overthrow of the Bourgeoisie via smashing the Bourgeois state, and replacing it with a Proletarian state that withers away as it untangles class contradictions. You cannot create Communism by killing all of the bourgeoisie, but by wresting their power as Socialism emerges from Capitalism.