Remove unnecessory and simplify
simplify