More cleanup - missed a couple of methods