Removed unussed stuffs