I think this can be removed entirely.