Removed block type handling