No need for this whole block - can be taken care of by the things up there.