Remove more useless