Remove deprecated flatten