Remove duplicate blocks typedef