Horse riding to be removed from modern pentathlon after Olympic horse punching ordeal