Removed unneeded stuffs