cleaned useless code