Remove legacy custom/