Shouldn't this be removed?