removed useless code 2