Hooray for removing code!