Code cleanup continued

Of course I missed a few things. Sigh.