Clean up some deprecated styles