Get rid of obsolote code.