deleted some unnecessary codes