Revert "Revert "merge removeGenre""

This reverts commit 06967651640b604e6be7c3bc1580c7146166d862.