Clean up of blocker code