block: cleanup from merge