removing more useless stuff