removing unnecessary stuffs