Remove unnecessary stuffs