removed some unnecessary codes