cleaned useless stuff