When doing boolean algebra it is common to encounter a formula like yours, and because it simplifies to something much smaller, it has been given a name:
Adjacency
$(X \lor Y) \land (X \lor \neg Y) \Leftrightarrow X$
$(X \land Y) \lor (X \land \neg Y) \Leftrightarrow X$
Remember this equivalence so you can spot it when it occurs and simplify it in one immediate step, rather than making things more complicated, as you were originally doing.
By the way, the name 'adjacency' comes from the fact that if you were to do a Karnaugh Map (K-Map) for the left hand side, you would find that the two terms are adjacent in the map, and can be captured by the more simpler term on the right hand side.
Oh, and here are two more pairs of equivalences that are really useful, but that people tend to forget or overlook:
Absorption
$P \land (P \lor Q) \Leftrightarrow P$
$P \lor (P \land Q) \Leftrightarrow P$
Reduction
$P \land (\neg P \lor Q) \Leftrightarrow P \land Q$
$P \lor (\neg P \land Q) \Leftrightarrow P \lor Q$
Add these three pairs of equivalences to your 'boolean algebra toolbox'!