Remove legacy style code