removed unneeded stuffs