Remove more useless code