Remove more unnecessary code.