How come we're removing all this code?