Remove legacy length hack