This whole clause needs to go.