Remove infix style and others