HS-63: Remove relation to clubs