Finished cleanup - missed a couple places.