Removing unnecessary stuffs