Remove more dead and redundant code.