Revert "merge removeGenre"

This reverts commit de5c6439b1a77a4255a098239249cd194d8b6003, reversing
changes made to f1294faa7b49a2e8179e95f096eeb4bd88df38a1.