eliminated useless code