Remove unnecessaries