removed useless code