remove more useless stuff