Remove legacy compatibility