removed useless codes