Ripping still more code out.