Remove more useless stuff