removed all remaining references to blocker code