Remove unnecessaries
Work around