Feature/club 850 feedback

Can we remove this?