diff --git a/pkg/orderers/pbftgoodcase.go b/pkg/orderers/pbftgoodcase.go
index 94bdbb493..6e70427be 100644
--- a/pkg/orderers/pbftgoodcase.go
+++ b/pkg/orderers/pbftgoodcase.go
@@ -206,7 +206,6 @@ func (orderer *Orderer) applyMsgPreprepare(preprepare *ordererspbftpb.Preprepare
 		return events.EmptyList()
 	}
 
-	//FIXME Address verification of the certificate after decision, issue #335
 	slot.Preprepare = preprepare
 
 	// Request the computation of the hash of the Preprepare message.
diff --git a/pkg/orderers/pbftslot.go b/pkg/orderers/pbftslot.go
index c7c704290..9efa77a04 100644
--- a/pkg/orderers/pbftslot.go
+++ b/pkg/orderers/pbftslot.go
@@ -113,14 +113,6 @@ func (slot *pbftSlot) advanceState(pbft *Orderer, sn t.SeqNr) *events.EventList
 				t.TimeDuration(pbft.config.ViewChangeSNTimeout),
 			))
 		}
-		eventsOut.PushBack(events.TimerDelay(
-			pbft.moduleConfig.Timer,
-			[]*eventpb.Event{OrdererEvent(pbft.moduleConfig.Self,
-				PbftViewChangeSNTimeout(
-					pbft.view,
-					pbft.numCommitted(pbft.view)))},
-			t.TimeDuration(pbft.config.ViewChangeSNTimeout),
-		))
 
 		// If all certificates have been committed (i.e. this is the last certificate to commit),
 		// send a Done message to all other nodes.