Feature/club 1029

That's no way of removing it!