Remove old styles that came back from merge conflict.