Dropped unnecessary stuffs