Remove more useless things