removed unnecessary stuffs