Refactor remove actions for artists and albums