removed some stuffs